d03a33411d86403f6d07d790aa65282e07f33b57,core/store/src/main/java/uk/gov/gchq/gaffer/store/schema/Schema.java,BaseBuilder,merge,#Schema#,282

Before Change


                        entity(entry.getKey(), entry.getValue());
                    } else {
                        final SchemaEntityDefinition mergedElementDef = new SchemaEntityDefinition.Builder()
                                .merge(getThisSchema().entities.get(entry.getKey()))
                                .merge(entry.getValue())
                                .build();
                        getThisSchema().entities.put(entry.getKey(), mergedElementDef);

After Change


                        entity(entry.getKey(), entry.getValue());
                    } else {
                        final SchemaEntityDefinition mergedElementDef = new SchemaEntityDefinition.Builder()
                                .merge(getThisSchema().getEntities().get(entry.getKey()))
                                .merge(entry.getValue())
                                .build();
                        getThisSchema().getEntities().put(entry.getKey(), mergedElementDef);